Skip to content

Bump extension/deps/openvic-simulation from 47be603 to 4bc9c5b#674

Open
dependabot[bot] wants to merge 1 commit into
masterfrom
dependabot/submodules/extension/deps/openvic-simulation-4bc9c5b
Open

Bump extension/deps/openvic-simulation from 47be603 to 4bc9c5b#674
dependabot[bot] wants to merge 1 commit into
masterfrom
dependabot/submodules/extension/deps/openvic-simulation-4bc9c5b

Conversation

@dependabot
Copy link
Copy Markdown
Contributor

@dependabot dependabot Bot commented on behalf of github May 20, 2026

Bumps extension/deps/openvic-simulation from 47be603 to 4bc9c5b.

Commits
  • 4bc9c5b Merge pull request #737 from OpenVicProject/typed_fixed_vector
  • edbe490 FixedVector size_type as template argument
  • 4f7789a Merge pull request #745 from OpenVicProject/fix/clang-format-header-order
  • ed6c198 Add missing dependencies to IncludeCategories
  • f6c94dd Merge pull request #743 from OpenVicProject/bugfix_infra_mapmode
  • 9e08ce9 Bugfix infra mapmode
  • d3843fe Merge pull request #734 from OpenVicProject/optimise_pops_aggregate_via_indexing
  • 3d53f45 Optimise PopsAggregate by using IndexedFlatMaps for party policies and reforms
  • ddb4db3 Merge pull request #740 from OpenVicProject/accept_small_pop_truncation
  • 368d1fa Accept truncations in pops smaller than 16
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot Bot added dependencies Pull requests that update a dependency file submodules Pull requests that update submodules code labels May 20, 2026
@dependabot dependabot Bot requested a review from a team as a code owner May 20, 2026 21:18
@dependabot dependabot Bot added dependencies Pull requests that update a dependency file submodules Pull requests that update submodules code labels May 20, 2026
@wvpm wvpm force-pushed the dependabot/submodules/extension/deps/openvic-simulation-4bc9c5b branch 3 times, most recently from add7015 to 812e331 Compare May 21, 2026 14:57
@wvpm wvpm enabled auto-merge May 21, 2026 14:59
case SORT_ISSUES:
return [](Pop const& a, Pop const& b) -> bool {
return sorted_fixed_map_less_than(a.get_supporter_equivalents_by_issue(), b.get_supporter_equivalents_by_issue());
return a.id_in_province < b.id_in_province;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still need to figure out how to do this efficiently.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't even find the Vic2 logic here.
The best I can for sure is that 1st click sorts ascending, 2nd click descending.
When descending, reforms come first. Otherwise party issues come first.
How they sort inside of that, no clue.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I implemented a simple version that compares the index of the largest issue and then compares the support for that issue. It lacks a tie breaker.

sorted_distribution.begin(), sorted_distribution.end(),
[](entry_t const& lhs, entry_t const& rhs) -> bool {
return lhs.first < rhs.first;
return lhs.first.get().get_identifier() < rhs.first.get().get_identifier();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the original logic here?
Pointer sorting?
I don't think all values had an index to sort by.

@wvpm wvpm force-pushed the dependabot/submodules/extension/deps/openvic-simulation-4bc9c5b branch 8 times, most recently from 1953dc9 to 3bf7d6c Compare May 22, 2026 09:37
Bumps [extension/deps/openvic-simulation](https://github.com/OpenVicProject/OpenVic-Simulation) from `47be603` to `4bc9c5b`.
- [Commits](OpenVicProject/OpenVic-Simulation@47be603...4bc9c5b)

---
updated-dependencies:
- dependency-name: extension/deps/openvic-simulation
  dependency-version: 4bc9c5b035d55ce1fce68e1e59734e3742a853e0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@wvpm wvpm force-pushed the dependabot/submodules/extension/deps/openvic-simulation-4bc9c5b branch from 3bf7d6c to 1237390 Compare May 22, 2026 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug dependencies Pull requests that update a dependency file enhancement submodules Pull requests that update submodules code topic:simulation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants